sysroot: Cleanup refs and prune even on last undeployment

I was working on a different test, and ended up being very confused at
the behavior where removing the last deployment didn't remove the last
`ostree/X/X/X` ref pointing to its commit.

There's no reason to special case the last undeployment AFAIK, and the
existing code handles this.

diff --git a/Makefile-tests.am b/Makefile-tests.am
index df216496a6a9f0f0f2cb812bcc7537b826cc6744..f94af25d7f0e17e0816fc42d925bf008577c3aeb 100644 (file)
--- a/Makefile-tests.am
+++ b/Makefile-tests.am
@@ -50,6 +50,7 @@ testfiles = test-basic \
        test-admin-instutil-set-kargs \
        test-admin-upgrade-not-backwards \
        test-admin-locking \
+       test-admin-deploy-clean \
        test-repo-checkout-subpath      \
        test-reset-nonlinear \
        test-oldstyle-partial \

diff --git a/src/libostree/ostree-sysroot-cleanup.c b/src/libostree/ostree-sysroot-cleanup.c
index 85364cc792380ddf11425973bb99a0d3823351bd..718c16e821b04ba92c2c11a8a000a0da6761b431 100644 (file)
--- a/src/libostree/ostree-sysroot-cleanup.c
+++ b/src/libostree/ostree-sysroot-cleanup.c
@@ -570,23 +570,20 @@ _ostree_sysroot_piecemeal_cleanup (OstreeSysroot              *self,
         goto out;
     }
 
-  if (self->deployments->len > 0)
+  if (!ostree_sysroot_get_repo (self, &repo, cancellable, error))
+    goto out;
+  
+  if (!generate_deployment_refs (self, repo,
+                                 self->bootversion,
+                                 self->subbootversion,
+                                 self->deployments,
+                                 cancellable, error))
+    goto out;
+  
+  if (flags & OSTREE_SYSROOT_CLEANUP_PRUNE_REPO)
     {
-      if (!ostree_sysroot_get_repo (self, &repo, cancellable, error))
-        goto out;
-
-      if (!generate_deployment_refs (self, repo,
-                                     self->bootversion,
-                                     self->subbootversion,
-                                     self->deployments,
-                                     cancellable, error))
-        goto out;
-
-      if (flags & OSTREE_SYSROOT_CLEANUP_PRUNE_REPO)
-        {
-          if (!prune_repo (repo, cancellable, error))
+      if (!prune_repo (repo, cancellable, error))
             goto out;
-        }
     }
 
   ret = TRUE;

diff --git a/tests/test-admin-deploy-clean.sh b/tests/test-admin-deploy-clean.sh
new file mode 100644 (file)
index 0000000..5eceaf8
--- /dev/null
+++ b/tests/test-admin-deploy-clean.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# Copyright (C) 2015 Colin Walters <walters@verbum.org>
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+set -e
+
+. $(dirname $0)/libtest.sh
+
+# Exports OSTREE_SYSROOT so --sysroot not needed.
+setup_os_repository "archive-z2" "syslinux"
+
+echo "1..1"
+
+ostree --repo=sysroot/ostree/repo pull-local --remote=testos testos-repo testos/buildmaster/x86_64-runtime
+rev=$(${CMD_PREFIX} ostree --repo=sysroot/ostree/repo rev-parse testos/buildmaster/x86_64-runtime)
+export rev
+ostree admin deploy --karg=root=LABEL=MOO --karg=quiet --os=testos testos:testos/buildmaster/x86_64-runtime
+ostree admin undeploy 0
+ostree --repo=sysroot/ostree/repo refs > refs.txt
+assert_not_file_has_content refs.txt '^ostree/'
+
+echo "ok deploy + undeploy repo prune"